Repository navigation
test(migration): read reserved words per database version from upstream sources (stable2.1 backport of #9991) - #10153
Merged
Conversation
…am sources (stable2.1 backport of #9991) Brings the reserved-word test of #9991 to the release line: the lists per MariaDB and MySQL series come from the upstream sources (branch head plus every release tag), with committed snapshots as the offline fallback. The mapper test stays as it is on stable2.1: the version on main uses the ListQuery signature that this line does not have. (taken from the test files of c457f76) Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…on stable2.1 On this line MigratedSqliteDatabase has no fallback for a bare clone, so the sentence #9991 dropped still holds here. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
WilcoLouwerse
commented
Nov 13, 2026
WilcoLouwerse
left a comment
Contributor
Author
There was a problem hiding this comment.
Verdict: APPROVE (Quick · backport)
Self-review of my own PR, so posted as a comment. Reviewed on head 9fd391e.
No 🔴 or 🟡 findings. One 🟢 was fixed before this verdict.
| # | Sev | Finding | State |
|---|---|---|---|
| f1 | 🟢 | The test header no longer said that the test needs a Nextcloud server. True on main, where MigratedSqliteDatabase has a fallback for a bare clone; not on stable2.1, where it still throws. |
Fixed in 9fd391e (sentence restored) |
What was checked
- Diff: 12 of the 13 files are byte-identical to the merge commit of #9991 (c457f76); the thirteenth differs in the one docblock sentence of f1. Nothing else changed against
stable2.1. - Fits on
stable2.1:MigratedSqliteDatabase::migratedSchema()has the same signature,autoload-devmapstests/,phpunit.xmlandphpunit-unit.xmlincludetests/Unit, anddoctrine/dbal(3.10.5) and PHPUnit (10.5.63) are the same as onmain. - Migrations on
stable2.1: a static scan of the column names against the ten snapshots givescursor groups limit offset schema schemas trigger, which equals the allowance list. The four migrations that onlymainhas add no reserved column. - Old fixtures: rewritten in place; no other test on
stable2.1reads them.
Not checked
- The test was not run: the worktree has no
vendor/and no Nextcloud tree. CI on this head is the evidence, and at the time of writing its checks had not started. - Columns named through a variable or created by raw SQL, beyond the two migrations the test header already names.
- The mapper-level
source_rowtest of #9991 is not part of this backport (the PR description says why), so that coverage stays in itsstable2.1form.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Backport of #9991 to the release line
stable2.1. Test code only; no change underlib/.ReservedColumnNamesTestno longer checks against two fixed word lists. The reserved words per MariaDB and MySQL series come from the upstream sources: the series' branch head plus every release tag.tests/Unit/Migration/fixtures/update-reserved-words.phpregenerates them.main,trunk) is reported as incomplete, not as a failure.tests/Support/ReservedWordSource.phpholds the parser and the download handling.Difference from #9991
tests/Unit/Db/ImportPreviewRowMapperMigratedTest.phpis left as it is onstable2.1. The version onmaincallsfindByPreview()with aListQuery, a signature this line does not have. Of the 13 changed files, 12 are identical to the merge commit of #9991 (c457f76).tests/Unit/Migration/ReservedColumnNamesTest.phpdiffers in one docblock sentence: it says again that the test needs a Nextcloud server's classes. OnmainMigratedSqliteDatabasehas a fallback for a bare clone; onstable2.1it does not.The mapper-level regression test for
source_rowthat #9991 changed therefore stays in itsstable2.1form.The
/backport to stable2.1run on #9991 stayed queued and was cancelled; this branch replaces it.Checks
vendor/). CI on this PR is the evidence.stable2.1equal the test's allowance list (cursor groups limit offset schema schemas trigger).Test plan
tests/Unit/Migration/ReservedColumnNamesTest.phpRefs #4909
🤖 Generated with Claude Code